# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.884.2.1 -> 1.884.2.2 # drivers/pci/pci.c 1.38.1.1 -> 1.38.1.2 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/12/16 nemosoft@smcc.demon.nl 1.811.1.12 # [PATCH] USB: PWC 8.10 for 2.4.20 # # Well, two patches in one... These patches will bring the PWC (Philips # Webcam) driver in both 2.4.20 and 2.5.51 up to version 8.10. Functionally, # the two branches are the same (about 70% of the code is shared), but the # differences in kernel architecture are too large to handle with a few # #ifdefs. # # This patch fixes the following (this are only the differences between 8.9 # and 8.10): # # * Fixed ID for QuickCam Notebook pro # * Added GREALSIZE ioctl() call # * Fixed bug in case PWCX was not loaded and invalid size was set # -------------------------------------------- # 02/12/16 arjanv@redhat.com 1.811.4.1 # [PATCH] USB pwc deadlock fixes # -------------------------------------------- # 02/12/16 greg@kroah.com 1.811.1.13 # Merge # -------------------------------------------- # 02/12/16 greg@kroah.com 1.811.1.14 # USB: pwc driver: fix compile time warning # -------------------------------------------- # 02/12/16 agrover@groveronline.com 1.811.3.3 # ACPI: Fix oops on module insert/remove (Matthew Tippett) # -------------------------------------------- # 02/12/16 willy@debian.org 1.884.3.1 # [PATCH] Add pci_bus_*() API for 2.4 [1/2] # # Introduce the pci_bus_(read|write)_config(byte|word|dword) functions from # Linux 2.5. Reimplement the pci_(read|write)_config(byte|word|dword)_nodev # functions as compatibility wrappers. # -------------------------------------------- # 02/12/16 willy@debian.org 1.884.3.2 # [PATCH] Convert acpiphp to pci_bus_*() API [2/2] # # Convert the acpiphp driver from the pci_*_nodev() API to the pci_bus_*() API. # This patch is relative to 2.4.21-bk. # -------------------------------------------- # 02/12/16 agrover@groveronline.com 1.884.4.1 # Merge groveronline.com:/root/bk/linux-2.4 # into groveronline.com:/root/bk/linux-2.4-acpi # -------------------------------------------- # 02/12/16 axboe@suse.de 1.884.5.1 # [PATCH] cciss driver update # # -------------------------------------------- # 02/12/16 david-b@pacbell.net 1.811.1.15 # [PATCH] remove CONFIG_USB_LONG_TIMEOUT # # This matches 2.5.latest ... the config option isn't needed, # since neither timeout was actually as large as what the # USB spec says (5 seconds). It'll prevent some devices # from failing to enumerate (like MGE Ellips UPSes). # -------------------------------------------- # 02/12/16 david-b@pacbell.net 1.811.1.16 # [PATCH] usbnet: framing, sync with 2.5 # # This patch matches the 2.5 patch I just submitted, except that # it keeps Pavel's table-based crc32 code since # says it's not for "bulk data" (which is what this driver does). # Plus some changes (ethtool) were forward ports from pre1. # # - Addresses two issues Toby Milne reported against the Zaurus: # (a) if skbs had extra framing added (z, net1080, gl620a), # the original size (now too small) was used on tx; # (b) added FLAG_FRAMING_Z so rx packets had enough space # # - Stubs in some PXA-250 support for non-Zaurus PDAs. # This is currently commented out; so far those PDAs # only run Linux for bleeding edge developers. # # - Minor cleanups. # -------------------------------------------- # 02/12/16 jkt@Helius.COM 1.811.1.17 # [PATCH] uhci corruption on usb_submit_urb when already -EINPROGRESS # # uhci corrupts a list, either uhci->urb_list or uhci->urb_remove_list, # when usb_submit_urb is called against an urb already in flight # (urb->status == -EINPROGRESS). yeah, i know you're not *supposed* to do # that but Real Programmers(tm) make Real Mistakes(tm) (and timeouts are # oh, so tricky!) and the code catches this case otherwise; unfortunately, # the INIT_LIST_HEAD has already hammered your list. # # :{)} # -------------------------------------------- # 02/12/16 greg@kroah.com 1.811.1.18 # [PATCH] USB: uhci: fix formatting problem with last patch. # -------------------------------------------- # 02/12/16 mlocke@mvista.com 1.884.5.2 # [PATCH] serial.c fix: ELAN fix breaks others # # The check for buggy ELAN processors in serial.c also passes on some ARM # boards. I wrapped the check with CONFIG_MELAN. The attached patch is # against the latest bk tree. # # [ Part 2: "Attached Text" ] # # # This is a BitKeeper generated patch for the following project: # # Project Name: Linux kernel tree # # This patch format is intended for GNU patch command version 2.5 or higher. # # This patch includes the following deltas: # # ChangeSet 1.812 -> 1.813 # # drivers/char/serial.c 1.32 -> 1.33 # # # # The following is the BitKeeper ChangeSet Log # # -------------------------------------------- # # 02/12/13 mlocke@pluto.mvista.com 1.813 # # The check for buggy ELAN processors also passes for some ARM processors who are not buggy # # -------------------------------------------- # # # -------------------------------------------- # 02/12/16 hch@sgi.com 1.884.5.3 # [PATCH] fix small style error in arch/i386/config.in # # -------------------------------------------- # 02/12/16 akpm@digeo.com 1.884.5.4 # [PATCH] ext3 deadlock fix # # My recent fix for the ext3 data=journal umount data loss problem # has a bug. The filesystem can deadlock if someone runs `mount -o remount' # while the filesystem is under load. Everything which writes to that # filesystem gets stuck in `D' state. # # This is because: # # a) ext3_sync_fs() has to wait until a transaction has finished. # # b) a transaction cannot finish when someone else holds lock_super(). # Because lock_super() is used in the block allocator. # # The patch ensures that ->sync_fs is never run under lock_super(). # # # # # Documentation/filesystems/Locking | 2 ++ # fs/buffer.c | 2 +- # 2 files changed, 3 insertions(+), 1 deletion(-) # -------------------------------------------- # 02/12/16 agrover@groveronline.com 1.884.4.2 # Merge groveronline.com:/root/bk/linux-2.4 # into groveronline.com:/root/bk/linux-2.4-acpi # -------------------------------------------- # 02/12/16 greg@kroah.com 1.884.3.3 # Merge bk://linuxusb@bkbits.net/pci_hp-2.4 # into kroah.com:/home/greg/linux/BK/pci_hp-2.4 # -------------------------------------------- # 02/12/16 axboe@suse.de 1.884.5.5 # [PATCH] cpqarray driver update # # -------------------------------------------- # 02/12/16 akpm@digeo.com 1.884.5.6 # [PATCH] ext3 use-after-free bugfix # # A change was made to ext3 in 2.4.20-pre9 which will cause the # filesystem to run ext3_mark_inode_dirty() against a freed inode. # # This will occur when an application attempts to add a new file/directory # to the filesystem and encounters space or inode exhaustion. # # The results of this are unpredictable. Usually, nothing happens. But # it can cause random memory corruption on SMP, and the kernel will crash # if compiled for "debug memory allocations". # # The problem is that ext3_add_nondir() will do an iput() of the inode # on error (which frees the inode) but we then run ext3_mark_inode_dirty() # against it. # # Fix it so that we only run ext3_mark_inode_dirty() if the inode was # successfully instantiated. # # # # fs/ext3/namei.c | 11 +++++------ # 1 files changed, 5 insertions(+), 6 deletions(-) # -------------------------------------------- # 02/12/16 greg@kroah.com 1.884.6.1 # Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.4 # into kroah.com:/home/greg/linux/BK/gregkh-2.4 # -------------------------------------------- # 02/12/16 bjorn_helgaas@hp.com 1.884.2.2 # PCI: fix printk spec for dma_addr_t # -------------------------------------------- # diff -Nru a/drivers/pci/pci.c b/drivers/pci/pci.c --- a/drivers/pci/pci.c Wed Oct 8 09:08:17 2003 +++ b/drivers/pci/pci.c Wed Oct 8 09:08:17 2003 @@ -2065,9 +2065,9 @@ } #ifdef CONFIG_PCIPOOL_DEBUG if (((dma - page->dma) + (void *)page->vaddr) != vaddr) { - printk (KERN_ERR "pci_pool_free %s/%s, %p (bad vaddr)/%x\n", + printk (KERN_ERR "pci_pool_free %s/%s, %p (bad vaddr)/%lx\n", pool->dev ? pool->dev->slot_name : NULL, - pool->name, vaddr, dma); + pool->name, vaddr, (unsigned long) dma); return; } #endif